build: Rename 'disable-modules' option

We should not have 'disable' in the name, to conform with the Meson best
practices for boolean options.

diff --git a/meson_options.txt b/meson_options.txt
index 5d98ba5242906f8f0d2695f18e2f9bec28dc2afc..42283abdd2c16e7a7fe9f735f8639c9ebd2a67a2 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -24,8 +24,8 @@ option('enable-cloudproviders', type: 'boolean', value: false,
   description : 'Enable the cloudproviders support')
 option('enable-xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
   description : 'Enable support for the Xinerama extension')
-option('disable-modules', type: 'boolean', value : 'false',
-  description : 'Disable dynamic module loading')
+option('dynamic-modules', type: 'boolean', value : true,
+  description : 'Allow dynamic module loading')
 option('with-included-immodules', type: 'string', value : '',
   description : 'Build the specified input methods into gtk (comma-separated list or "all" or "none")')
 option('documentation', type: 'boolean', value: 'false',

diff --git a/modules/input/meson.build b/modules/input/meson.build
index 0111790c73059cf0cbb88dd1e254dc9e987fe3d6..72171582dba8de7c9f8e27bbd07b6cb12be45358 100644 (file)
--- a/modules/input/meson.build
+++ b/modules/input/meson.build
@@ -6,8 +6,8 @@
 # there is a bit of an ordering problem which we solve by collecting all the
 # information here but moving the actual build definitions to gtk/meson.build.
 build_dynamic_modules = false
-disable_modules = get_option('disable-modules')
-if not disable_modules
+dynamic_modules = get_option('dynamic-modules')
+if dynamic_modules
   gmodule_supported = dependency('gmodule-no-export-2.0').get_pkgconfig_variable('gmodule_supported')
   if gmodule_supported == 'true'
     build_dynamic_modules = true